Warning fixes - Federico

diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index c844f3f83265aa0014152b4c17d87b3577197b87..5b67aa912dad38b72e84a00e1d736ac3fdb2e843 100644 (file)
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -478,7 +478,7 @@ progressive_updated_callback(GdkPixbufLoader* loader, guint x, guint y, guint wi
 {
         GtkWidget** window_loc = data;
 
-/*     g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
+/*     g_print ("progressive_updated_callback:\n\t%d\t%d\t%d\t%d\n", x, y, width, height); */
 
         if (*window_loc != NULL)
                 gtk_widget_queue_draw_area(*window_loc,

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 34cb1e57e201f2c6843ff740b46fefdb3ec2d6b1..b024c7482679c192a64d9192a0b3e29e71f520ea 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -3,6 +3,12 @@
        * src/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Added
        documentation.
 
+1999-11-09  Federico Mena Quintero  <federico@redhat.com>
+
+       * src/io-png.c: Fixed some incompatible pointer initializations.
+
+       * src/io-jpeg.c (image_load_increment): Remove unused variable.
+
 1999-11-09  Michael Fulbright  <drmike@redhat.com>
 
         * src/testpixbuf.c: Fixed it to use timeout to read from file

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index fd402d29ffff4b817d5dc5278d113291002c45fc..68660d4c74f9ac9ff8040fbaee1c9b328574ed68 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -481,7 +481,7 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                        /* we're decompressing so feed jpeg lib scanlines */
                        guchar *lines[4];
                        guchar **lptr;
-                       guchar *rowptr, *p;
+                       guchar *rowptr;
                        gint   nlines, i;
                        gint   start_scanline;
 

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index c4d1c5e1676b3f6bfd3383827715bfe2083479c4..5165a9e863cbde6657d5ceeba38d5c6a2218c31b 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -586,11 +586,13 @@ image_load (FILE *f)
        PnmIOBuffer *inbuf;
 
        /* pretend to be doing progressive loading */
-       context.updated_func = context.prepared_func = NULL;
+       context.updated_func = NULL;
+       context.prepared_func = NULL;
        context.user_data = NULL;
        context.inbuf.bytes_left = 0;
        context.inbuf.next_byte  = NULL;
-       context.pixels = context.pixbuf = NULL;
+       context.pixels = NULL;
+       context.pixbuf = NULL;
        context.got_header = context.did_prescan = FALSE;
 
        inbuf = &context.inbuf;
@@ -693,7 +695,8 @@ image_begin_load (ModulePreparedNotifyFunc prepared_func,
        context->prepared_func = prepared_func;
        context->updated_func  = updated_func;
        context->user_data = user_data;
-       context->pixbuf = context->pixels = NULL;
+       context->pixbuf = NULL;
+       context->pixels = NULL;
        context->got_header = FALSE;
        context->did_prescan = FALSE;